Is Tawaf-ul-Wada` sufficient in place of Tawaf-ul-Ifadah in spite of one's intention to perform the first?

Q: I performed Tamattu` Hajj (`Umrah during the months of Hajj followed by Hajj in the same year with a break in between) in 1415 A.H. And I do not remember if I did Tawaf-ul-Ifadah (final obligatory circumambulation of the Ka`bah in Hajj) or not, but I probably did not. However, I (Part No. 10; Page No. 235) performed Tawaf-ul-Wada` (circumambulation of the Ka`bah on leaving Makkah). Is the Tawaf-ul-Wada` sufficient in place of Tawaf-ul-Ifadah in spite of my intention? Moreover, I performed Ifrad Hajj (performing Hajj only) this year, 1417 A.H. On behalf of my father and observed all the rituals of Hajj perfectly, praise be to Allah. Is my first Hajj in 1415 A.H. Valid? If not, how can I validate it? Is the Hajj I performed on behalf of my father, may Allah have mercy upon him, valid?

A: If it is more probable that you did not perform Tawaf-ul-Ifadah (final obligatory circumambulation of the Ka`bah in Hajj) and did not intend it during Tawaf-ul-Wada` (circumambulation of the Ka`bah on leaving Makkah), you have to return to Makkah and perform this Tawaf because it is a pillar and Hajj is incomplete without it. You are committed to Dam (atonement required of a pilgrim for a willful violation of a prohibition or obligation while in the ritual state for Hajj and `Umrah) if you had sexual intercourse before performing Tawaf-ul-Ifadah to be slaughtered in Makkah and distributed among its poor people. Also, you are required to avoid copulating with your wife until you go to Makkah and perform Tawaf-ul-Ifadah (final obligatory circumambulation of the Ka`bah in Hajj) for your first Hajj. You should repent to Allah for this negligence and for not hastening to ask about what is obligatory on you. As for the Hajj you performed on behalf of your dead father, it is valid and sufficient, in sha'a-Allah (if Allah wills).May Allah grant us success. May peace and blessings be upon our Prophet Muhammad, his family, and Companions.